Added non simulate option
Merge branch 'origin/master'