Started implementation of #47

Started implementing some of the suggestions from [issue #47][1].

[1]:https://github.com/0xAX/weber/issues/47