Almost premium features
Merge pull request #45 from HSkogmo/master

Almost premium features
Almost done
Merge pull request #46 from HSkogmo/master

Almost done