Merge pull request #150 from audreyso/CB-13501