general improvements
Merge branch 'master' of https://github.com/devstarter/ii
+