Merge pull request #1 from fnakstad/master

pull from source