Updated version to Fatih's code release