#105 global namespace cleanup
Merge pull request #115 from joola/feature/#105

#105 global namespace cleanup