Merge pull request #121 from shawnfeldman/master

fix configuration