Optimization
Refactoring
Fixes #27: collection attribute assignment
Merge master into orm: refactoring & bugfixes