Addressed issue #34 - RFC3633 errata 2470