Revert pr #26 from master