fixed some indentation and package names
Merge remote-tracking branch 'origin/master'