Fixed compilation for OS X, and some styling cleanup
Version bump