Fixes #57
Fixes #58
Merge pull request #67 from XboxLeaders/develop

! Two issue fixes