Merge pull request #38 from ahmet-celik/master

Minor fixes and resolved merge conflicts
minor cleanup from last commit
Merge pull request #39 from bstell/master

minor cleanup from last commit
add the new/improved measurment info
Merge pull request #40 from bstell/master

add the new/improved measurment info
Minor tweaking to the "above the fold" position
Merge pull request #41 from bstell/master

Minor tweaking to the "above the fold" position
Added EMPTY_FS flag to pretend if filesystem is empty
If it is true, ignores content in the filesystem
If it is false, uses content in the filesystem
Merge remote-tracking branch 'upstream/master'