fixed: #86 #89 , configuration changes