Master
Merge branch 'developement'

* developement:
  Development commit

Conflicts:
	README