Added TAEcon support
Merge pull request #478 from teamalpha5441/master

Added TAEcon support
Merge remote-tracking branch 'upstream/master'