Merging tools branch and fog_dev branch with cuckoo 1.0