Merge pull request #18 from wtangiit/master

some fix and enhancement