Merge pull request #147 from dewguzzler/master

2 minor changes