Working and tested implementation
Merge branch 'master' of github.com:sielay/octopusidentity

Conflicts:
	package.json