Merge pull request #120 from aukaost/master

Replaced dynamic module attributes with actual references