last changes
Merge branch 'master' of github.com:lkroenung/cs5001
final version?