Merge pull request #269 from remear/master

Late night work
Merge remote-tracking branch 'upstream/master'