Merge pull request #16 from jcesarmobile/CB-10358