Merge pull request #18 from l8on/master