Merge pull request #44 from wtangiit/master

misc enhancement