Changes for issue #11

Made the changes in the correct branch this time.