Merge branch 'pwaleczek/master'

Conflicts:
	package.json