Restaured two files from pull request #2