working prototype 1.4.1
Merge remote-tracking branch 'internetz/master'