Manually added suggestions from #102 pull request