fix on expiration time
Merge branch 'master' of http://github.com/leandrob/astor