moving around functions
Merge pull request #41 from cbwiedel/master

Moving around functions