Avoid deprecation warning
Remove extra comma
Merge pull request #1 from bquorning/minor_changes

Minor changes