Merge pull request #3 from retricide/master

Merge
Bunch of changes

Starting to use git!