Final change - now it works lol
Merge pull request #156 from niden/master

Final change - now it works lol