Bootstrap 版 fixes #161 @siberiawolf
Merge pull request #49 from justjavac/master

Bootstrap 版 fixes #161 @siberiawolf