Merge pull request #14 from rdpeng/master

Miscellaneous updates