handler added
Merge branch 'master' of https://github.com/douglasjfm/dstreamrepo

Conflicts:
	main.cpp