temporary code for paper
Merge branch 'devel' of github.com:boyangli/Apprentice into devel