Modified Bug and added Author tag.