OPTIMIZE for
merge pull request #27