Updated for iPhone 5/5s & fix some Windows bugs