version change
Merge pull request #145 from EricWittmann/version-1.2

version change to 1.2