Merge pull request #1 from jamesjenkinsyates/master

Various fixes and features