added new functionality, revved to 0.10.5