Encon updates
Merge pull request #19 from profbass/master

Encon updates