Merge pull request #2 from tpoulsen/master

To current.