Fixing #305
Merge pull request #309 from spekary/bugfix-ExtendedAssnTable

Fixing problem with extended association table expansions, optimizing association table expansion