Issue #1 fixed. dhirajbajaj changes pull.