Krešimir Špes - 2010-02-14

will be considered after 1.0 release