final stuff
Merge pull request #6 from amsheehan/alex

final stuff