Fixed formatting.
Fixed external deps build on OSX.
Merge pull request #227 from est77/est

Fix for external deps build on OSX and small formatting fixes.