Updated to latest from upstream.  Version 0.0.7