road to 1.0.2 [merge,release]
Merge pull request #30 from douggr/master

road to 1.0.2 [merge,release]