Merge pull request #692 from oskarirauta/master