FEEDBACK FINAL
Merge pull request #56 from AllanWu/master

FEEDBACK FINAL