User suggestions from github issues 10 and 11