Semantics! Partial pt. 2
Merge pull request #17 from Vandenn/master

Semantics! Partial pt. 2