Fix bug for windows
Fix bug on execute
Fix bug on wiew edit
Merge pull request #47 from zoic21/master

Merge from master