Resolves Issue #255 and #268
Merge branch 'master' of github.com:datafolklabs/cement