PR for dev_1.0

Removed po. :sweat_smile: