Adding in ams-enc to master branch