Merge pull request #5 from bickleydb/master

Taking Daniel's code.