Remove 1 second sleep
Merge remote-tracking branch 'origin/master'

Conflicts:
	libcanopy/src/canopy.c