Commit 07-02-2013 @ 16h:04mm by Zelaiti Dhekra