Addressed #14, Attached patch for same. Please review