small fixes
Merge branch 'master' of https://github.com/ellchow/moRe
Merge branch 'master' of https://github.com/ellchow/moRe
Merge branch 'master' of https://github.com/ellchow/moRe
Merge branch 'master' of https://github.com/ellchow/moRe
Merge branch 'master' of https://github.com/ellchow/moRe
Merge branch 'master' of https://github.com/ellchow/moRe
Merge branch 'master' of https://github.com/ellchow/moRe
num.classes hack for compatibility