Merge pull request #35 from wtangiit/master

fix and update