If the property already contains 's' in the end, do not add a new one
Fix boolean handling
Merge pull request #3 from gzsombor/master

Fix minor issues