Merge branch 'master' into prod
Version bump to 0.1.5
Merge branch 'prod'