MrSimbax Merge pull request #11 from macieyn/patch-1