windows program cleanup and code optimization
Merge pull request #12 from mstubinis/master

windows program cleanup and code optimization