Reverted back to old behaviour
Merge pull request #43 from djonsson/develop

Reverted back to old behaviour