make bug
Merge pull request #2 from mbabisch/develop

mbabisch's bug