Added comments
Added comments
Added comments
fixed conflicts
Merge pull request #159 from r3dunlop/master

Added Comments