Merge pull request #1 from msk-/master

Pulling changes from msk