update methods
Merge origin/master
fixed a bug in reservation class