Added grace period from Travja

Added Travja's changes for grace period from 27.3.2013