Can you delete /* JASMINA ADDED JB*/ please.
Keep the the comments aligned like in the rest of the code.
Also, keep the lines no longer than 80 characters.
(These things may seem annoying, but for am open-source code, especially for one as big as this, it's necessary to keep a coherence and order in the style).