Initial Stuff
Merge pull request #1 from Vilsol/master

Initial Stuff