Merge pull request #1 from iampersistent/master

working library