Merge pull request #4 from bassman5/master

Merge pull request #3 from bassman5/develop
Fix file1 for something
Fix file2 for something
Merge pull request #5 from bassman5/feature/Fix_something

Fix file1 for something
Merge pull request #6 from bassman5/develop

Release v1.2