Issue #56 - Added support for ToAge
Issue #56 - Igor's fix + refactor