fix commit
Merged master and fix branches