Fixes #153.
Updated change log.
Refactored syntax.