Fixed bug: addition of extra option