- refactoring
* intermediate commit
- updated GAFObject implementation