jimmywarting Merge pull request #6 from valioDOTch/patch-1