Merge pull request #29 from phenaff/develop

Fixed notebooks
Fixed expiry date calculation