Fix potential bugs and incomplete docs
Merge pull request #224 from thiemowmde/pasta

Fix potential bugs and incomplete docs