Merge pull request #57 from SuricatoMeerkat/master

Execute flag cleanup
Merge branch 'master', remote-tracking branch 'upstream/master'