Added more general axis handling
I know this isn't really the best way to use cvs - but then is this whole patch business anyway?
