Merge pull request #2 from jamesra/master

Minor fixes on the road to initial release
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Updated version documentation