Replaced questionmark operator throughout
Merge pull request #23 from pavelgj/remove-questionmarks

Replaced questionmark operator throughout as it's deprecated