Merge pull request #80 from evoskuil/develop

Standardize include sort, white space, casts, add missing includes.