V.1.0 Alpha 7

#Bug Issue 5 By $Muhammad Qadri Khaerun Ali