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

Almost premium features