Merge branch 'master'

Conflicts:
	src/main/java/ru/histone/Histone.java