Fixed #188
Merge branch 'master' of https://github.com/htmfilho/yougi
Merge remote-tracking branch 'upstream/master'