DATA-1501
Merge pull request #23 from mjmeans/master

DATA-1501