ggg
Merge pull request #4 from iisdan/1

ggg
Merge branch 'master' into 2

Conflicts:
	README.txt