Minor Code Cleaning
Merge branch 'development' of https://github.com/sbatman/Cranium into development