Merge pull request #1 from unclebob/master

I would like to have the latest changes that I forked from in order to build and test it on my local machine