Merge pull request #62 from jcesarmobile/CB-13757