closes #95, #73
closes #95, #73

HazemKhaled/TiShadow,r8o8s1e0/TiShadow,titanium-forks/dbankier.TiShadow,titanium-forks/dbankier.TiShadow,titanium-forks/dbankier.TiShadow,r8o8s1e0/TiShadow,FokkeZB/TiShadow,Biotelligent/TiShadow,Biotelligent/TiShadow,emilyvon/TiShadow,emilyvon/TiShadow,Biotelligent/TiShadow,HazemKhaled/TiShadow,emilyvon/TiShadow,FokkeZB/TiShadow,r8o8s1e0/TiShadow,FokkeZB/TiShadow,HazemKhaled/TiShadow