Bug fixes
Merge pull request #2 from Cbieniak/week8Uni

Bug fixes