Merge pull request #159 from wtangiit/master

misc fixs