added support for dictionary conditionals, improved documentation