Updates

Updated README, cleaned up some classes, implemented new way to see
selected objects
Merge remote-tracking branch 'origin/master'