Merge pull request #2 from massix/master

Sync
Merge with head