working prototype 1.4.1 and i hope no more commits
Merge remote-tracking branch 'internetz/master'