Fixing minor bug
User guide final
Manual merge user guide