Integration pull request

This is a pull request for those changes done in sprint one.