Merge pull request #97 from jchambers-ln/master

rolling in changes for eda compatibaility
Merge remote-tracking branch 'upstream/master' into eda