Mpaf lune 101414

Merging of MPAF and LUNE classes