Mike changes

Merge for pull request #52