Issue 8

Resolve #8