Merge pull request #22 from graybealski/master

address issue #21 with latest and hero