Minor cleanup
Merge remote-tracking branch 'upstream/master'
Merge pull request #6 from craigbr/master

Minor cleanup