Updates after the end of Sprint 9
Merge pull request #26 from chessbyte/sprint_9_end

Updates after the end of Sprint 9