Testing

Updated and merging to master