Cleanup.
On-demand attribute loading.
Merge pull request #4 from DVAlhadeff/master

On-demand attribute loading.