Merge pull request #24 from kkchuchu/develop

Develop
Merge branch 'develop' of https://github.com/eternnoir/NLORM into develop