Adding sanitizing of the input
Merge branch 'master' of https://github.com/Malo87/ogre

Conflicts:
	src/convert-to-json.js