Merge pull request #1 from themccallister/develop

Bug fixes