Dev 1.0 First Pull Request

Please fix indentions in this function :bow: