fgnass Merge pull request #1 from warmans/master