0.32-1
Merge pull request #128 from brucehoff/develop

0.32-1