small bug fixes
Merge pull request #124 from hardimanb/master

small bug fixes