solve space conflict
Merge branch 'develop' of https://github.com/kkchuchu/NLORM into develop