Merge branch 'develop'
Build
HACK: Flag parsed functions to determin how they should be called
Merge branch 'master' into develop