Added user tornqvist
Removed email address
Added email address
Merge w/upstream
Merge pull request #256 from tornqvist/master

Added my email address