c++03 compatible returns
acceptance test update