Final version
Merge pull request #43 from conclarke/master

Final version