Resolve #34 Resolve #35