Fixed #2
Syntax refactored
Minor enchantments
Updated docs and changelog