fixing bugs step1
All bugs fixed
clean test project files
Merge pull request #23 from alxnek/DevelopmentAlex

all bugs fixed, final version