minor changes
minor directory naming change
merge v1.2
merging branch v1.2
resolved merge conflict