Tests and fixes
Fixes
Fixes
Merge pull request #1 from KaiSmith/master

Tests and Fixes