added pragmas
Updated for changes in original repository