More n more refactoring
Merge branch 'develop' of https://github.com/sl-codenine/nexis into develop

Conflicts:
	nexis/nexis/Nexis.php