Re: #31 - Added wrap option