merge famo.us v 0.2