Ömercan - 2012-02-28

Nearly finished, add dependency control... and make it better