Refactor for better interface
Update readme for 0.4.0