Merge pull request #1 from AKotl/master

Slight changes
test 2