revert pull req #27 and close #24