Merge origin/master

Conflicts:
	README.md
Merge origin/master

Conflicts:
	README.md
Merge pull request #1 from Jupit/dev

Merge from dev