Improve semantics
Merge pull request #5 from jedesah/master

Improve semantics