Intial real commit
Merge remote-tracking branch 'droidremote/master'