didnt catch that last merge conflict
Release v. 1.1