Changed version
Resolving conflicts
changes after code review
Merge pull request #3 from zanox/demo_branch_2

Demo branch 2