close #1
Clean up
Merge branch 'develop' of https://github.com/sl-codenine/nexis into develop