fix and whitespace errors
Merge pull request #108 from sidschingis/master

fix