Fixed ticket 10. Merged from /gnuradio/developers/branches/jcorgan/ticket-10.