Fixed arguments usage for strict compliance
Fixed function call order
Merge pull request #89 from killroy42/master

Fixed arguments usage for strict compliance