hannob Merge pull request #8 from kasperkarlsson/master …