Merge pull request #27 from NicolasKessler/master

Did some cleanup, moved some classes to the util package and created the