first execution errors
Resolved first execution errors
Merge pull request #2 from lelouch-mayher/dev

Dev