support for other parameters
Merge branch 'master' of ssh://github.com/openplanets/scape