Various fixes
Merge pull request #169 from GrahamCampbell/new

Various Fixes