Thanks Ray, closes #46