Merge pull request #1 from nokiadev/master

...