Merge pull request #143 from marttipiirainen/nextmerge

Merge 'next' branch to 'master'