More ENCON updates
Merge pull request #20 from profbass/master

More ENCON updates