Merge pull request #11 from alexxvk/master