bumped version
fixed merge conflict
fixed merge conflicts
fixed merge conflicts
Merge pull request #17 from wesleykendall/develop

Added ability to suppress acquisition exceptions