Updated to make duration optional

Resolves #19