0.1.2 prep
Merge pull request #16 from mhaskel/0.1.2-prep

0.1.2 prep