Merge pull request #81 from khawkins/unstable

Merging master back to unstable