Merge pull request #107 from djarecka/master

after merge