More bugs.
Merge pull request #38 from jhorbulyk/Jacob-FixBug

More bugs.