adding a few changes
Merge branch 'master' into gregory
adding back to top link
Merge pull request #39 from GJST-Capstone/gregory

Gregory