Add more configuration options #577
Update docs #577