Fixed return types and static methods
Merge branch 'master' of https://github.com/unok-kun/HTFM