Merge branch 'develop'

Merge pull request krolow#36 from krolow/develop

Merge develop changes

Merge pull request krolow#31 from krolow/develop

Merging develop

Merge branch 'develop'

Conflicts:
	composer.json

stable 0.1