Resolve #5
Add some helper metohds