Dev 1.0 First Pull Request

Mam indentions in sublime is properly aligned :(