Merge pull request #5 from gwadej/master

A few more topics.