Fix for issues #297 and #298
Fix for issues #297 and #298

eiszfuchs/caddy,ollie314/caddy,joshix/caddy,evermax/caddy,captncraig/caddy,mem/caddy,tgulacsi/caddy,buddhamagnet/caddy,dusty/caddy,tpng/caddy,tpng/caddy,tpng/caddy,joshix/caddy,tw4452852/caddy,captncraig/caddy,cez81/caddy,devangels/caddy,buddhamagnet/caddy,dusty/caddy,tgulacsi/caddy,tw4452852/caddy,Karthic-Hackintosh/caddy,Karthic-Hackintosh/caddy,pedronasser/caddy,hackintoshrao/caddy,Karthic-Hackintosh/caddy,tobya/caddy,tobya/caddy,tobya/caddy,cez81/caddy,eiszfuchs/caddy,pyed/caddy,ollie314/caddy,captncraig/caddy,buddhamagnet/caddy,hackintoshrao/caddy,eiszfuchs/caddy,elcore/caddy,pedronasser/caddy,eiszfuchs/caddy,elcore/caddy,ollie314/caddy,hackintoshrao/caddy,yukimochi/caddy,tpng/caddy,tgulacsi/caddy,evermax/caddy,dusty/caddy,mem/caddy,buddhamagnet/caddy,pyed/caddy,tobya/caddy,joshix/caddy,pedronasser/caddy,tgulacsi/caddy,DenBeke/caddy,elcore/caddy,DenBeke/caddy,mem/caddy,DenBeke/caddy,pyed/caddy,evermax/caddy,yukimochi/caddy,dusty/caddy,pyed/caddy,evermax/caddy,cez81/caddy,devangels/caddy,yukimochi/caddy,pedronasser/caddy,tw4452852/caddy,ollie314/caddy,hackintoshrao/caddy,Karthic-Hackintosh/caddy,DenBeke/caddy,devangels/caddy,mem/caddy,tw4452852/caddy