modify according to suggestions from jrjohansson
modify according to suggestions from jrjohansson

modify according to suggestions from jrjohansson on pull request
https://github.com/qutip/qutip/pull/282

zasdfgbnm/qutip,zasdfgbnm/qutip