Song of the strange ascetic

CLOSES #5
Merge branch 'feature'

Conflicts:
	README.md