merged changes from csotl project