Fixed bugs.
Merge pull request #116 from jwien001/master

Fixed bugs.