Rewrite and refactor methods, correct bugs
Merge branch 'master' of https://github.com/Bastnt/FDB