Merge pull request #1 from leadhead9/develop

Fixes
Merge pull request #6 from leadhead9/develop

Many bugfixes and features