fix merge conflicts
fixes merge conflicts
Merge pull request #109 from 121watts/pending-tests

Pending tests