Semantics! Partial
Merge pull request #16 from Vandenn/master

Semantics! Partial