fixes
sync
Merge pull request #6 from viliusle/master

merge