Miscellaneous changes
Miscellaneous changes
Merge pull request #30 from stliu/Miscellaneous

Miscellaneous changes