Adding additional Duration options
Merge pull request #35 from Ownageful/cb-131

cb-131