Merge branch 'development' of github.com:clicksminuteper/nucleus into development