Merge pull request #92 from khawkins/unstable

Updating shared repo commit