Issue71 Merge
This should be ready to merge, but as I'm fairly new to this i would like it if PM went over my fix to make sure it does not break anything else
This should be ready to merge, but as I'm fairly new to this i would like it if PM went over my fix to make sure it does not break anything else