refactoring
bugfix
refactoring
added simple console application