Merge pull request #24 from xsacha/master

Nokia N9/Harmattan port