Adding functionnal API + pause option
Merging master