Merge pull request #48 from gAmUssA/master

fixes