working version 1.4
Merge remote-tracking branch 'internetz/master'