#251 #252 #243 Fixes
Merge pull request #253 from Tickthokk/master

#251 #252 #243 Fixes