Add optimizations and Retry FM
Retry FM
Merge pull request #4 from neXusPRIME/master

Merge Master with PA branch