As suggested in issue #60

Feel free to change as you see fit.