Issue-31 Resolves issue #31

Also resolves #32