1.2.0 pre release
Merge pull request #29 from rustyswayne/master

1.2.0 pre release