Merge pull request #112 from nsikkila/master

jotain
Merge remote-tracking branch 'upstream/devel'