Resolve #32

Resolve #32