Fix #26
Fix #14
Update docs