Re added double format and deleted commented code.
Merge branch 'master' of https://github.com/n3phele/core
fixing tests.