Small changes before name change.
Merge pull request #6 from thomassjogren/dev

Small changes before name change.