Remove option-to-dict transformation. Fixes issue #1
Add generic target generator functions
Update docs
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
Update docs