Resolved conflict.  Resolves #166 pull request