Various Updates
Various updates
Fixed syntax error (missing then)
Merge pull request #1 from Windower/master

asdf
Merge pull request #15 from nitrous24/master

Various updates to send/aecho