Added add method
Merge origin/master
Merge origin/master