nick - added enterpriseId + bug fixes
Merge pull request #30 from inbarsto/enterpriseIdAndFixes

nick - added enterpriseId + bug fixes