Merge pull request #4 from 404d/master

Syntax improvements and problems