Merge pull request #24 from wtangiit/master

misc updates