temp checking
Fixed binding of attributes
duplicate header remove
Removed commented code
Merge pull request #131 from jaytaph/wip/callfix

Wip/callfix