rollback to 0.10
remove compiler warnings
merge
remove warning