Merge pull request #41 from gawrysz/master

updated configuration for phoenix