Temporary fix for Oregon's problems
Merge pull request #47 from dckesler/master

Temporary fix for Oregon's problems