Fixed wait group bug with panic handling that was causing a hang
Merge branch 'release/0.2.1'

Conflicts:
	README.md