Revert "Revert "Merge pull request #36 from krono/krono/draft-enhanchement""