use something a little more universal - this should probably be an actual setting somewhere?
Merge pull request #41 from ruebot/7.x

use something a little more universal