Minor updates
Merge pull request #3 from jkat98/updates

Minor updates