Merge pull request #50 from Starli0n/st2

Add a new feature trim trailing white space before diff and bug correction
Merge remote-tracking branch 'upstream/st2' into st2