merged version 0.1 from irian