Merge pull request #4 from vladpetric/master

Ntest - build with both VS 2013 and gcc 4.7
Works on Mac
Merge pull request #1 from weltyc/mac

Mac