Merge pull request #1 from sosandstrom/master