merged files from pull request 1