Lots of changes :P
Merge pull request #1 from amadornes/master

Lots of changes :P