Improve configuration (close #17)