reverting Merge pull request #24