Support file comments too

and custom --map
Release 0.2.0