Merge pull request #1 from Metsa/master

Test merge
Merge pull request #2 from Metsa/master

TestMerge
Merge pull request #2 from neoneola/master

TestMerge