Merge pull request #50 from Toops/master

Sync