Small bug fixes
Merge pull request #2 from AbbyJonesDev/master

Small bug fixes