Merge pull request #2 from plamoni/master

sync repo