More fixes
Merge pull request #18 from Ryan-Cooper/master

More fixes