Fixed errors
Merge pull request #1 from MattAitchison/fix-matt

Fixed errors