Merge branch 'master' of https://github.com/aletheia/jSOAM

Conflicts:
	README.md