removed global "using namespace std", replaced with local using declarations
Merge branch 'master' of https://github.com/eldorz/ldfsl