Merge pull request #1 from jarikurri/devel

Pulled devel