Merge pull request #1 from Skwidensky/master

Merge