Merge pull request #13 from khawkins/unstable

Distribution: merging master into unstable