synchronous code
updated gitignore
Merge branch 'origin/refactoring'