Merge remote-tracking branch 'twinther/master'

Manually merged latest 3 commits from Twinther on Feb 12th