merged more changes from Master
Merge branch 'refs/heads/add_subtract_columns' into gh-pages