Commit in pull-request
Merge branch 'master' into pull-request

Conflicts:
	main.cpp
Merge pull request #2 from grizlee11/pull-request

Pull request