original code from mark
Merge branch 'master' of http://github.com/davidtmerritt/escalier