bug fixes
Merge pull request #14 from malcdi/amyj

bug fixes