Merge pull request #48 from jakobmoellers/master

fixes issue #18
added credits for Jakob; cleared code a bit
updated README
Update README.md