constroller support merge
ver 0.2
add controller support