changes and adding new features
fix
minor fix
Merging Alex's branch
Fixed conflicts and merged with upstream