Merge pull request #24 from jjacob/master

Everything looks fine now, merging.