Merge pull request #17 from wtangiit/master

some enhanced features