Merge pull request #19 from l8on/master