Fixed and merged with master
Merged with master