#24 fixed previousAttributes for initial set of attributes
Merge remote-tracking branch 'origin/dev' into dev