closes #372
closes #372

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