Latests changes
Merge pull request #3 from knilsen/master

Latests changes