importing version 0.9.5
Merge pull request #10 from mheuer-nmdp/import-095

Importing version 0.9.5