Merge pull request #1 from widmofazowe/master

Merging master into HEAD