commit maart12 16.59

ifdef removed, not tested