Worked on #5 and #9

Signed-off-by: Vishal Rana <vr@labstack.com>