fix bugs
fix bug in role model
Remove project-specify code
Merge pull request #61 from Xedar/master

Fix bugs