eaip changes
Merge branch 'master' of github.com:misteliy/sampling