new options
removed puts...
Merge pull request #4 from motoko-kusanagi/dev

dev -> master