Merge pull request #26 from pavelki/master

Bugfixes
Merge remote-tracking branch 'upstream/master'