Fix problem with ternary operator and add reasonable names to methods
Merge pull request #97 from bluesm/1.5.2

Fix problem with ternary operator and add reasonable names to methods