Merge pull request #22 from l8on/master