#187 Merge updates for Win8.1