Version 1.4 prototype
Merge remote-tracking branch 'internetz/master'