first commit
Merge https://github.com/elandivar/elastiphone