Made expression shorter and more readable
Merge pull request #3 from rejinka/master

Made expression shorter and more readable