issue #345 refactored - commit for travis