Pull Request Dev_1.0

same with my other comment.. please be more specific in naming variables po :bow: