hopefully last first execution fix...
Merge pull request #7 from lelouch-mayher/dev

hopefully last first execution fix...