[~] minor interface fixes
[~] .gitignore fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
[~] .readme fix