Commit 07-01-2013 @ 15h:21mm by Zelaiti Dhekra