Merge pull request #72 from ndawe/master

Minor cleanup