Merge pull request #62 from jstrobl/master

OK, using a "squash and merge" method for merging is not a best idea in this case. Let's do this merge properly to preserve the individual commits made by me...