Fixing bugs.
Merge pull request #166 from jaredbischof/master

Fixing bugs.