Test 1.0

Andreas
Merge pull request #1 from pawnielsen/master

Test 1.0