added jh_feature
Merge branch 'master' into jh_feature

Conflicts:
	README.md
Merge pull request #3 from bojh/jh_feature

Readme überarbeitet