Resolve conflicts
API fixes
Resolve conflicts
Merge branch 'develop' of https://github.com/nickr500/echodrop into develop