Merge pull request #14 from FreshDumbledore/develop

Start EP can be set