Adds latest support from multishot.

Fixes for #2 #3 #4