Added support for extra's (extra-google-* etc.)

This fixes issue #16