merging pending changes from ink.js to ink..
Merged with the SAPO's InK repo