Added info display methods
Merge origin/master