Initial version
Minor style fixes
Input changes
Setting files
Merge remote-tracking branch 'origin/master'