1.2.6 prep
Merge pull request #96 from mhaskel/1.2.6-prep

1.2.6 prep