Develop

Sorry, my editor removes trailing whitespace by default.  The significant change is on line 128.  All the rest are just trailing whitespace issues.

This fixes issue: #25

Cheers!