Put back code so tests keep working
Update version
Merge pull request #3 from mck-/master

Put back code so tests keep working