Ömercan - 2011-06-12

This must be done before documentation...