Merge pull request #4 from rjaffe/master

NOJIRA: Updating diffs
NOJIRA: Remove temporary comments