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