fin API connection

@author: GMartigny
Merge origin/master