Merge pull request #1 from ivarne/master

Sync this
Merge pull request #2 from mariusnn/master

Merge pull request #1 from ivarne/master