Some bugfix
Some more bug fix
Merge pull request #156 from msyk/filemakr-auth-bugfix

Filemakr auth bugfix