Duplicated pull req #25 that was merged with master

...by accident.