Bug fix #4400

#Status: Fixed
Signed-off-by: A V Minhaz <minhazav@gmail.com>
Removed trailing whitespace for bugfix#4400

Signed-off-by: A V Minhaz <minhazav@gmail.com>
Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
Fix typos

Signed-off-by: Marc Delisle <marc@infomarc.info>