Merge pull request #40 from MiroslavGannoha/master

Merge pull request #2 from anotheria/master