Cleaned up comments. Added explicit arguments.
Merge remote-tracking branch 'origin/master'
Added unit conversions for input file.