Merge pull request #1 from mlk0/tProj2

od tProj2 vo master
Merge pull request #3 from mlk0/tProj3

merge into master
final clean up
Merge pull request #4 from mlk0/master

master to proj3