Pull Request Dev_1.0

You may do this if you have time po, if none, maybe we can apply this instead on future projects