Trying to make configuration more flexible (Should fix #6)