Make info and complete more robust
Merge pull request #55 from hugoduncan/feature/make-more-robust

Make info and complete more robust