added Michael comment
Merging changes with master