Merge pull request #9 from AMersch/master

Minor add-ons