RTFD
Clean code and documentation
Merge branch 'doc'

Conflicts:
	.gitignore
Merge branch 'doc'

Conflicts:
	.gitignore