Worked on issue #5

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