Merge pull request #20 from l8on/master