Final commit for 0.4! We are done here! :) And I am dying... ;]