Make AutoDict more robust.
Merge pull request #19 from bukzor/more_robust_auto_macros

Make AutoDict more robust.