Updated from original git repo to fix 'undefined' placeholder bug.