Included bin/ directory into build directory
Removed cruft and ambiguities from comments
Resolved merge conflict