Merge pull request #8 from TannerFilip/master

Various changes
Merge pull request #9 from TannerFilip/master

Add Submodules
back out submodules