Added Manager class. And some tweaks.
Merge remote-tracking branch 'origin/master'