Merge pull request #1 from larvalabs/master

bringing up to date
On commit #162 I inadvertently used the incorrect username
Merge pull request #173 from thomascate/master

incorrect username set on pull #162