Better handling of more address types and address component types

This pull request fixes Issues #30 and #31.