add FROM support and fix ordering
Release 0.4.0