Merge pull request #1 from amadornes/master

Lots of changes :P
Merge pull request #2 from amadornes/1.6.4

Merge pull request #1 from amadornes/master