ploxiln Merge pull request #69 from DrTall/patch-1 …