Merge pull request #64 from badnack/development

Development
renaming and log