Merge pull request #202 from timwindsor/master

Restoring commits since Dec 19 2013