Merge pull request #5 from AEgan/egan

Egan