Missing files from last commit. Issue #2