Function names improved
Readability clenaup
Merge branch 'refs/heads/master' into pointfile

Conflicts:
	index.html