fix 1
fix 2
Merge branches 'gh-1' and 'gh-2'

* gh-1:
  fix 2

* gh-2:
  fix 1

Conflicts:
	README.md