Removed #157 as no longer part of release