Merge pull request #3 from SJossy/master

Sync pull
Merge pull request #5 from SJossy/Test

Merge pull request #3 from SJossy/master