Closes https://github.com/iceiix/steven/pull/16 Enhances https://github.com/iceiix/steven/issues/18
Closes https://github.com/iceiix/steven/pull/14 Enhances https://github.com/iceiix/steven/issues/18