preparing for merge
fixed #26 again