Merge pull request #1 from mcongrove/1.2.0

pulling from mCongrove