initial work
Merge github.com:pj87/muged