Merge pull request #1 from SqueeG/master

Sync it up