Changed style to standard Crockfond-ish
Merge branch 'develop'