Working on refactoring stuff
Merge pull request #10 from aweidner/master

Working on refactoring stuff