Merge pull request #239 from khawkins/unstable

Merging master into unstable