More coding style namespace stuff
Merge pull request #57 from FrenkyNet/wip/1.0

More coding style namespace stuff