Merge pull request #6 from gwadej/master

A few more ideas I could present.