General fixes
Merge branch 'master' of github.com:simplerr/Project-TDDI02