Improved Error functionality.
Merge branch 'pr/5'
Fixing merge conflict
Conflicts:
	five.js