some stuff found while reading
Merge pull request #4 from martintrojer/master

some stuff found while reading