Updated version - fixes #31