Changed if statemed to oneliner
Merge branch 'fevent_dev' of github.com:MediaSapiens/flamaster into fevent_dev