Version 1.2
Merge pull request #1 from topher1kenobe/develop

Version 1.2