Updated syntax and features
Merge branch '004' into gh-pages