Added default cofiguration
Merged some unpulled changes