Update portability

Works with: VS2012 (Windows) and GCC 4.8.1 (Ubuntu)