My Small Contribution to Phoenix

I have made major changes and I hope you like them. All tests pass. I had to adapt to the changes in your repo. Please review and commit. Thanks.