fix
Merge remote-tracking branch 'upstream/master'
Merge, bugfixes
merge
Merge pull request #23 from kouzelnik/master

Merge