Merge branch 'master' into ki_branch
Merge pull request #7 from MatisseHack/master

Fixed MarkBad
Revert "Merge pull request #7 from MatisseHack/master"

This reverts commit 62b345e8964406751ee6733e046e578b141d426a, reversing
changes made to 6cdbb571ce000958a3cb6200b032a871290fc9c9.
Merge branch 'master' into ki_branch
Merge pull request #8 from kiwchang/ki_branch

Ki branch