Added iconPath as an option
Merge branch 'master' of https://github.com/Intermark/flavours