Merge branch 'master' into develop
Added helper functions to top, added some comments
Merge branch 'develop'
Removed old reference code