changes based on auto generated files I got after
Merge pull request #120 from westonplatter/patch-1

changes based on "bee" generated files