Fixed mistake in year calculation

Refactored previous commit
Merge branch 'master' of github.com:ohaal/wolfram