merging /sapo/Ink.js/pull/22/files from Ink.js