yallop Merge pull request #41 from z3t1/patch-2 …