Merge pull request #2 from Vengage/master

Rebase