Fix/config

Fixed #81