Dev 1.0

User wants to merge 3 commits into master from dev_1.0
the name has been changed