Updated Version

Appropriate return values defined