Merge pull request #40 from eysteinbye/adm/Test

Adm/test