Merge branch '1.0.4'
- fix authorization issues