Merge pull request #160 from alxhub/master

Port some quick fixes.