Resolves #7. Updating this file coz of a bug