Update to Mikko Paukkila's proposal
Merge pull request #1320 from stude1/master

Update to Mikko Paukkila's proposal