Merge pull request #18 from Gegga87/master

...
..
websycn
Merge remote-tracking branch 'upstream/master'