Remove upper bounds and close #148
Upper bounds for #151 and #136