Merge pull request #1 from ivarne/master

Sync this