Attempt to fix issue 10

Please review and see if there is anything that needs to be fixed.