Version 2.0.7 6/17 2012

Maintenance release with added features