Improved support for custom submission
Merge pull request #21 from shaxxx/master

Improved support for custom submission