0.9.1 pull

Merge the 0.9.1 update into my fork