Merge pull request #155 from rrgeorge/master

Minor fixes