Pull request

Second pull-request