Opps
Merge pull request #81 from rickcarlino/master

Minor changes