Tons of updates
Even more commits
Merge pull request #4 from sallain/master

Updateys