various changes
Merge branch 'devel' of https://github.com/boyangli/Apprentice into devel
refactor
Merge branch 'devel' of https://github.com/boyangli/Apprentice into devel