Adding/fixing header comments.
Updated comments.
Merge branch 'master' of ssh://git@github.com/nathanameye/OCaptainMyCaptain