Timestamps and dirty attributes

Moved commits to develop branch. From issue #25