Added comments + minor code refactoring. /library -> /includes
Merge remote-tracking branch 'origin/master'