Saner naming of the parameters.
Merge branch 'master' of http://github.com/rockwolf/lisa