merge complete -- Pull Request #15