Minor Implementation Updates

See pull request #11 for details