Edison

merge edison to master
move these to test.cpp