Compatibility with harmattan
Merge pull request #354 from xsacha/master

Nokia N9/Harmattan port
Merge pull request #355 from HomerSp/master

Potential bug fixes and compiler warnings
Changed psmf to psmfStruct