updated merge for aws compile
Merge branch 'master' into aws_compile
merge native id on compile
Merge pull request #43 from nearform/aws_compile

Aws compile