Enhanced it, better & featured.

@tejastank