misc update
Merge pull request #3 from mhor/misc

Miscellaneous enhancements