Added requested feature :D