stephen 1.1
stephen 1.2
stephen 2.1
stephen 2.1 another one
stephen 3.3
...
Merge pull request #12 from matje/master

Small comments from Stephen