Merge pull request #66 from Hasimir/master

Minor option update, major execution update