Pull Request 17 fixing of conflicts.