fzliu Merge pull request #57 from utak3r/master