Fixed issue #133

Hi Don, 

I have made the fixes as you suggested. The solution builds okay now. Sending you the pull request as you asked.

Bikal