Dev 1.0 First Pull Request

Please fix indentation. :cherry_blossom: