Initial Commit
Merge pull request #2 from stephenmcm/Alex

Merge in Alex's updates