Merge remote-tracking branch 'origin/s3' into s3

Conflicts:
	build.sbt
Merge pull request #3 from uryyyyyyy/s3

 Merge remote-tracking branch 'origin/s3' into s3