Merge all other contributions

New features
Fix Windows bugs
If there are any questions with my update, I can answer then very specifically when I get back to the hotel tonight.

Unfortunately, I was not certain that the git had the latest code because I found differences with the same gem code.  I questioned this months ago but never heard back.   I will help in any way you would like .  Just let me know

Sent from Yahoo Mail on Android