Updated code to prepare for merging
Merged changes from origin