Release version 2.0 including new checks and better return values