Merged code

Merged my code into master branch