Revise configuration

Fix #28